diff --git a/src/images/tilesets/greendale-lounge.png b/src/images/tilesets/greendale-lounge.png
index 571f0ee72..27eb0a2ea 100644
Binary files a/src/images/tilesets/greendale-lounge.png and b/src/images/tilesets/greendale-lounge.png differ
diff --git a/src/items/improvements/hologram.lua b/src/items/improvements/hologram.lua
index f4f27ff92..888affc40 100644
--- a/src/items/improvements/hologram.lua
+++ b/src/items/improvements/hologram.lua
@@ -3,7 +3,7 @@ return{
   description = "Pierce's Hologram",
   type = "improvement",
   subtype = "improvement",
-  info = "Before he passed Pierce donated money to install a hologram near the Library.  Unfortunatly the Dean spent the money purchasing Honda products.",
+  info = "Before he passed Pierce donated a hologram near the Library.  It's currently broken and the Dean spent all our extra money on Honda products.",
   MAX_ITEMS = 1,
   quantity = 1,
   directory = 'improvements/'
diff --git a/src/maps/borchert-pool.tmx b/src/maps/borchert-pool.tmx
index 2f544b823..b1cd58f86 100755
--- a/src/maps/borchert-pool.tmx
+++ b/src/maps/borchert-pool.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="42" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="42" height="14" tilewidth="24" tileheight="24" nextobjectid="8">
  <properties>
   <property name="autosave" value="false"/>
   <property name="blue" value="249"/>
@@ -8,10 +8,10 @@
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
- <tileset firstgid="1" name="pool" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="pool" tilewidth="24" tileheight="24" tilecount="120">
   <image source="../images/tilesets/pool.png" width="240" height="288"/>
  </tileset>
- <tileset firstgid="121" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="121" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="city_little_clouds" width="42" height="14">
@@ -61,13 +61,13 @@
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="120" y="216" width="96" height="48">
+  <object id="1" name="main" type="door" x="120" y="216" width="96" height="48">
    <properties>
     <property name="level" value="borchert-hallway"/>
     <property name="to" value="pool"/>
    </properties>
   </object>
-  <object type="liquid" x="528" y="264" width="480" height="72">
+  <object id="2" type="liquid" x="528" y="264" width="480" height="72">
    <properties>
     <property name="drag" value="true"/>
     <property name="opacity" value="0.7"/>
@@ -75,23 +75,23 @@
     <property name="sprite" value="images/liquid/water2.png"/>
    </properties>
   </object>
-  <object type="info" x="288" y="210" width="108" height="24">
+  <object id="3" type="info" x="288" y="210" width="108" height="24">
    <properties>
     <property name="info" value="State-of-the-art judge's table, which has its own built-in sound system,| so take that Yale."/>
    </properties>
   </object>
-  <object type="bouncer" x="541" y="180" width="60" height="30">
+  <object id="4" type="bouncer" x="540" y="168" width="60" height="30">
    <properties>
     <property name="dbval" value="1420"/>
    </properties>
   </object>
-  <object type="climbable" x="486" y="216" width="12" height="48"/>
-  <object type="info" x="48" y="216" width="24" height="48">
+  <object id="5" type="climbable" x="486" y="216" width="12" height="48"/>
+  <object id="6" type="info" x="48" y="216" width="24" height="48">
    <properties>
     <property name="info" value="You can faintly hear the sound of water running and someone singing."/>
    </properties>
   </object>
-  <object type="info" x="0" y="216" width="24" height="48">
+  <object id="7" type="info" x="0" y="216" width="24" height="48">
    <properties>
     <property name="info" value="You can faintly hear the sound of water running and someone singing."/>
    </properties>
diff --git a/src/maps/greendale-computer-wing-2.tmx b/src/maps/greendale-computer-wing-2.tmx
index f516d333e..fa3385243 100644
--- a/src/maps/greendale-computer-wing-2.tmx
+++ b/src/maps/greendale-computer-wing-2.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="24" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="5">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
@@ -7,40 +7,40 @@
   <property name="soundtrack" value="computer-wing"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
- <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24" tilecount="230">
   <image source="../images/tilesets/greendale-computer-wing.png" width="240" height="552"/>
  </tileset>
- <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
- <layer name="background" width="24" height="14">
+ <layer name="background" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxzZ2BgcKchZqExFgDiAChNbQw0t2HU/FHzKTU/CojzaICB5jZUAOkUIOajAQaa20Ars+mFaVm2gTAAhx0vVw==
+   eJxzZ2BgcKcBZqERFgDiAChNLQw0r2HU3FFz0c2NAuI8KmKgeQ0VQDoFiPmoiIHmNVDbTFpjWpQ5IAwA7bYsIw==
   </data>
  </layer>
- <layer name="foreground" width="24" height="14">
+ <layer name="foreground" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFgwWIQmkxBoYGcs2QoI5T6A4SILhhDZBei0PNViDeBsTbgXgHEOsA8TEgPo6kJhC3+Q5AfACf+SBwAIgPIvEvAPFFJD4vlD4ExIeB+AgQH8VijhwSOxqIY/DYiQzEofQZID4LxOeA+DwWdRpI7GvAcEsj0nxigRGVzSMFNABxIxA34ZAvB2IfIPall4PwAADRRxpi
+   eJxjYBgF9AKiUFqMgaGBVL0S1HUKzUACBDesAdJrcajZCsTbgHg7EO8AYh0gPgbEx5HUBGKa6wDEB/CZCwIHgPggEv8CEF9E4vNC6UNAfBiIjwDxUSR5OSR2NBDH4LELGYhD6TNAfBaIzwHxeSR5DST2NWD4pBFpLiFgRCVzSAENQNwIxE045MuB2AeIfenlICQAACFDGmI=
   </data>
  </layer>
- <layer name="fade" width="24" height="14">
+ <layer name="fade" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJy7xMDAcGkUj+JRPIpHMckYANr7E7A=
+   eJy7xMDAcGkUj+JRPIqHAQYAFh78qQ==
   </data>
  </layer>
- <layer name="collision" width="24" height="14">
+ <layer name="collision" width="22" height="14" visible="0">
   <data encoding="base64" compression="zlib">
-   eJx7zsDA8JyGmAGJphUYNX/UfFqZz8gIwehADCgmjkUcl/nEqkUGUlC7JbHoRXYTLcOHlmUDreOVHgAA5HQ02w==
+   eJx7zsDA8JwGmAGJpjYYNXfUXGLNZWSEYHQgBhQTxyKObi4hNdiAFNROSSS9yG6gRTjQIg/TKr5oCQCeszE/
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="288" y="192" width="24" height="72">
+  <object id="1" name="main" type="door" x="288" y="192" width="24" height="72">
    <properties>
     <property name="level" value="greendale-computer-wing"/>
     <property name="to" value="wing2"/>
    </properties>
   </object>
-  <object type="info" x="372" y="204" width="42" height="36">
+  <object id="2" type="info" x="372" y="204" width="42" height="36">
    <properties>
     <property name="info" value="They're just a bunch of basketball cards with white people on them."/>
    </properties>
diff --git a/src/maps/greendale-computer-wing-3.tmx b/src/maps/greendale-computer-wing-3.tmx
index 41149332e..d242bb4ad 100644
--- a/src/maps/greendale-computer-wing-3.tmx
+++ b/src/maps/greendale-computer-wing-3.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="24" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
@@ -13,34 +13,34 @@
  <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
- <layer name="background" width="24" height="14">
+ <layer name="background" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxzZ2BgcKchZqExFgDiAChNbQw0t2HU/FHzKTU/CojzkHAFGp9cDDS3AWRWChDz0QADzW2gldn0wrQs20AYAJkVL2E=
+   eJxzZ2BgcKcBZqERFgDiAChNLQw0r2HU3FFz0c2NAuI8JFyBxicVA81rAJmRAsR8VMRA8xqobSatMS3KHBAGAP4eLC0=
   </data>
  </layer>
- <layer name="foreground" width="24" height="14">
+ <layer name="foreground" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJztzkduwkAYhmFfAsQZyCVDyTIgJHrvPQFCaAEh2EFYAqFlQwnn4I3EYmTZkk28yIJPeuTx+J/PI0n3/IdYDOgwX58mA7puyQprbLDFDt+w4kHlTAVVvGjo3+OAI074wRkeYcYLn/DeQhsddGV9fjjgxJOwPxTWYUQQRQxxJGQ9I4wV7pvEM1xwC/sTYZ1FDnkUUERJ+N7DB/oYyPrLCCCIkML/f/OKGupo4A1NlVl53pFCGhmNZ5QyxSdmOs48wga7htk5FljiS+/l/pgLXmMz8A==
+   eJztzslOAkEQxvF5CQ3PAC8JCEcgJoDIvsiOyKpsIXgTOMomcEGQ5+B/GJLKhNFMIJz8kl+6u7qq04ryn2vEdMbsrbreXOIjBjLHAl9YYoU1zLDozBRRwvMv727wjS12+MEe96LHC584N/GKN7TUmh93cMApevtiH0QIYUQQRUzznwHexTkOF9zwiPqH2D8hjQyyyCEv7tvooIueWivgAQE8KqdTxgsqqKKGuk7vMQ0kkETqj15thhhhbHDOChvsOvefmGCKmcG3z8kB4bQz8A==
   </data>
  </layer>
- <layer name="fade" width="24" height="14">
+ <layer name="fade" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJy7xMDAcGkUj+JRPIpHMckYANr7E7A=
+   eJy7xMDAcGkUj+JRPIqHAQYAFh78qQ==
   </data>
  </layer>
- <layer name="collision" width="24" height="14">
+ <layer name="collision" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJx7zsDA8JyGmAGJphUYNX/U/KFuvhgjBIOAOCNCXArIlmCEiEkyYtf7HE0PNQEtywZahzs9AAAxuDUb
+   eJx7zsDA8JwGmAGJpjYYNXfU3MFirhgjBIOAOCNCXArIlmCEiEkyoup5jqaWGoAWeZhW4UpLAADkMDF/
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object id="1" name="main" type="door" x="552" y="192" width="24" height="72">
+  <object id="1" name="main" type="door" x="504" y="192" width="24" height="72">
    <properties>
     <property name="level" value="greendale-computer-wing"/>
     <property name="to" value="wing3"/>
    </properties>
   </object>
-  <object id="2" type="hiddendoortrigger" x="114" y="204" width="36" height="24">
+  <object id="2" type="hiddendoortrigger" x="114" y="204" width="36" height="60">
    <properties>
     <property name="height" value="24"/>
     <property name="message" value="Do you want to select a song?"/>
diff --git a/src/maps/greendale-computer-wing.tmx b/src/maps/greendale-computer-wing.tmx
index ab3c5531c..bcc812c37 100644
--- a/src/maps/greendale-computer-wing.tmx
+++ b/src/maps/greendale-computer-wing.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="32" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="32" height="14" tilewidth="24" tileheight="24" nextobjectid="8">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
@@ -7,10 +7,10 @@
   <property name="soundtrack" value="computer-wing"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
- <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="greendale-computer-wing" tilewidth="24" tileheight="24" tilecount="230">
   <image source="../images/tilesets/greendale-computer-wing.png" width="240" height="552"/>
  </tileset>
- <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="231" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="background" width="32" height="14">
@@ -33,20 +33,15 @@
    eJy7xMDAcGkUj+JRPIpH8SgeYRgAcYdvkA==
   </data>
  </layer>
- <layer name="collision" width="32" height="14">
+ <layer name="collision" width="32" height="14" visible="0">
   <data encoding="base64" compression="zlib">
    eJx7zsDA8HwA8SgYBaNgeAExRgYGcUby9Q4kYATaLwXEkoyo7pGC+kmMESHGSIRbkf2DrP4fA6T8+zNAmIFxtPwFAQDG9z5G
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="6" y="216" width="48" height="60"/>
-  <object type="info" x="72" y="216" width="24" height="48">
-   <properties>
-    <property name="info" value="Hello, rich people?"/>
-   </properties>
-  </object>
-  <object type="climbable" x="24" y="60" width="12" height="198"/>
-  <object type="door" x="0" y="30" width="48" height="30">
+  <object id="1" name="main" type="door" x="6" y="216" width="48" height="60"/>
+  <object id="3" type="climbable" x="24" y="60" width="12" height="198"/>
+  <object id="4" type="door" x="0" y="30" width="48" height="30">
    <properties>
     <property name="instant" value="true"/>
     <property name="level" value="greendale-lounge"/>
@@ -54,18 +49,18 @@
     <property name="to" value="vendingmachine"/>
    </properties>
   </object>
-  <object type="info" x="624" y="216" width="24" height="60">
+  <object id="5" type="info" x="624" y="216" width="24" height="60">
    <properties>
     <property name="info" value="This door is locked."/>
    </properties>
   </object>
-  <object name="wing3" type="door" x="408" y="216" width="24" height="60">
+  <object id="6" name="wing3" type="door" x="408" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-computer-wing-3"/>
     <property name="to" value="main"/>
    </properties>
   </object>
-  <object name="wing2" type="door" x="216" y="216" width="24" height="60">
+  <object id="7" name="wing2" type="door" x="216" y="216" width="24" height="60">
    <properties>
     <property name="level" value="greendale-computer-wing-2"/>
     <property name="to" value="main"/>
diff --git a/src/maps/greendale-exterior.tmx b/src/maps/greendale-exterior.tmx
index e922db511..7056ac13f 100644
--- a/src/maps/greendale-exterior.tmx
+++ b/src/maps/greendale-exterior.tmx
@@ -43,12 +43,12 @@
  </layer>
  <layer name="leaves" width="240" height="18">
   <data encoding="base64" compression="zlib">
-   eJztmTlOw0AYhScdCIrABUgR6B3WUIBTWFQU3CANF4ALzEWQ0kFDD4LCDYtEJGhZJDgKbxRbOMbxNhMvyfukp9ie7fc/eWNnIgQhhBBCCCFEF0cI2xJioIRjt+x4CCHpUN6NuOYWHwmpIgtY02PKWsVFQsI4MXPDZ/HsotbstHNL/1YXK7ncLSKOuuKMJMuOIwvB962wh+FH15AGBd/WXBLnX5T16/bdLJrFmuWnqN9K9G8xqOeH8mlY9O1s4kRfk6bHqZt/EW8/LuZhgbGQatCEVqDVDG0eoEfoCXqeRlBifM1W3kV8EnHKZsjH29AOtAvtZRwjyb/hsXTJk2syu9xAt97xGXSeo482tA5tZGjzDn1An9BXjjHzgPgk4pRqL2pTiB9fqix478GyJCX5t23Yv3lyPU9cTzjO0k6HS+jKUF9BOt7+aWdK+6jdHG3yrhdBsua9a9hPpt+f0+RE5Xrf5KBkjBdoqSHEcuN/mb+H4u+vWN78+9fvoPu/urZV8u+ri5T1jqfQZ1T9U03/HXvt/ednL6JOT6R/Buv69yRdHTd4Hl6DtxLaD1PmLOu8mMJ/B9Ihah7z8g2twbutCP+GsUeS/vkr9BZTXibBteRQo59JnonDFubyoPZwTPTj9TXQaa+TR3skeYTPg4p8RyYxjPg/gBBCCCGEEEIImXd+AW5rfb8=
+   eJztmbtOwzAYhd0NBEPhBehQ2FuuZYB0iJg68AZdeAF4gTxKN1jYQTBk4SJRCVYuEjwKx2oi0pDmYrtu0p5POmoSx/afPzl24gpBCCGEEEII0cUVwmkJMZDCtj/reAgh+ZDeTTjm24+ElJEljOkpZQ17kZA4bsq94Vw8v8gxO++9pX/LSyu73LcRR1VxR/JmHUcRou9bcQ/Dj74hDSxf1kKS5l+U9av2bNpmuWL5sfWtRP/aQc4f0qdx0bfziZt8zDPdT9X8i3j7aTEPLcZCykEdWoPWC9R5gB6hJ+h5GkGJ8TFbehfxeYjTq8d8vAvtQfvQQcE+svwb70sXlVyT+eUGug22z6ELhTaa0Ca0VaDOO/QBfUJfCn2qgPg8xOnJtahtIX5CybLotUfLspTl36Zh/6rkepG4nrBdpJ4Ol9CVobaitIP10/aU1lE7CnVUx4soRfPeMewn0+/PeXIic31oslMyxgu0UhNitfa/LFxDCddXWsH9D4/fQfd/5zqtinxf9Sz1c6bpv15QP5w/uwnndEX+OVjXv6f5zvGj+/ExeCej/rDkazzhO5AOSfdRlW9oA95tJPg3jjOSF+6/Qm8p5bMkOpYca7QzyTNpOMJcHuQajol2grYGOvV18uiM5J3g96gkz8gkhgn/BxBCCCGEEEIIIYvOLxBRe0s=
   </data>
  </layer>
  <layer name="lampposts" width="240" height="18">
   <data encoding="base64" compression="zlib">
-   eJztmr1OwzAUhd0NxFJ4AobCBlIb/spA0yGCpUPfoAsvAC+QF6nUDRZ2EAzZqQTiZ4aRh2DgusTEWI7jOiFtyvmkIyLbuffW8XFaC8YAAAAAAAAAeQkY85uMjbjoOpp1PQAAO7h3NW1R+ZWAeWSJ9nRD33p5lQCVwPBs8C5eXPiebfts4d/5pZndH5VRR1UJvhXOuo5pkL9vqR4mP0YFaVTyx/qXmPxLfYOqrc2yWa7Y/JT1Wwn+LQf+/uA+VQXfLiaBvi0sOk/V/Ev1Dkw1j0usBcwHddIqaW3WhSjIezb3LtUXUp1hXfHxLmmPtE86mDJHln/VXHmZ17kGs+GadBNfn5HOHWI0SBukzSnueSI9k15Irw45XaD6Qqoz5GdRHmPvQrxP/uxyX5ay/Nso2L8uc71orBj6rlKus3C5T1fHBenScqxNn6AVn5+2Cj5HFbnbRQa1zMlJm+u0OWkX7CfX789p9Zn2UHmuD3PkcMElVt78HyntXs64Joake0O/OEPh5yuepv2WdJe0Tf7XhF+baj5xrNWGYUa/yN0rMKZp/Cn5z+b5pc1JL/aveH92NWO6zP4d7Opf8Rn6FmP78doQ96h78E5GjrHlnqU+Fzmuyxrzfl//zNlWjbHtWtLG6xvHdcZ/J3ymxD3WtOmeoytvljFFHb40vw+kR2mMH/fralbj/DVNaa12cuRO84wJnyXzZJPTNIaf4ViEsMLVv6K+jnGU/h6Bz5K1caTxaN51IfvPJZbtPWONAAAAAAAAAACA/8AXY6+PNA==
+   eJztmrtOwzAUht0NxFJ4AobCBlIbbmWg6VDB0qFv0IUXgBfIiyB1g4UdBEN2KoG4zDDyEAwcl5gYy3FcJ7i3/5N+NfLt/HF8nNYqYwAAAAAAAICidBgL64wNuOg6nrQfAIAdPHc1ZbF/J2AaWaI93VC37s8JUOkYng3exfML37Ntny3yd3qp59fHPnzMKp0fRZP2MQ7y9y01hykf45I08HxbC4kpf6muP2tr0zfLMzY/vn4rIX/9wN8fPE9VIW/nk46+LCo7zqzlL/ntmzwPPXoB00GVtEpam7QRBXnP5rlL/iLyGVWVPN4l7ZH2SQdjxsjLXzVWUaZ1rsFkuCHdJtdnpHOHMWqkDdLmGH2eSS+kV9KbQ0wXyF9EPiN+FhUw9iHE6+R7l+vylJe/tZLz12Wu540VQ911xnUeLv10Pi5JV5ZtbeoEjeT8tFHyOaqI3SxzUMuYnKy5zpqTZsn55Pr9OcufaQ+V5/qwQAwXXMYqGv8zozwoOK6JC9KDoV6cofDzlUBTfke6T8tG/zXh1ybPJ45ey0DE7nqKd0r5Z/P8suakm+SveH+2NW3azP4d7Jq/4h56Fm17ydoQfdQ9eCcnxtBxz5LHdVljwd/r3znbqjC2XUnLuL9h4jP5HPGVMe6xpkz3HF15txxT+Ail+X0kPUltwqRe51kd57+pS2u1VSB2Vs6YCFk6TzYxTW34GY7FEFa45q/w1zK20vcRhCxdG0eaHC26LuT8cxnLts9QIwAAAAAAAAAAYBH4BgWVjMA=
   </data>
  </layer>
  <layer name="collision" width="240" height="18">
@@ -232,7 +232,7 @@
    </properties>
   </object>
  </objectgroup>
- <objectgroup name="movement">
+ <objectgroup name="movement" visible="0">
   <object id="35" name="airline" x="3763" y="85">
    <polyline points="1998,-3 -3768,0"/>
   </object>
diff --git a/src/maps/greendale-lounge-bathroom.tmx b/src/maps/greendale-lounge-bathroom.tmx
index 0d1984539..b92a61934 100644
--- a/src/maps/greendale-lounge-bathroom.tmx
+++ b/src/maps/greendale-lounge-bathroom.tmx
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="10" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="10" height="14" tilewidth="24" tileheight="24" nextobjectid="4">
  <properties>
   <property name="soundtrack" value="greendale-alt"/>
  </properties>
- <tileset firstgid="1" name="bathroom" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="bathroom" tilewidth="24" tileheight="24" tilecount="100">
   <image source="../images/tilesets/bathroom.png" width="240" height="240"/>
  </tileset>
- <tileset firstgid="101" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="101" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
  <layer name="Background" width="10" height="14">
@@ -21,7 +21,7 @@
  </layer>
  <layer name="Wall Features 2" width="10" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYKAv4GNgaMAnz8PAkMANpGGYnkCCTvYoI7H5scgLQ2kuIFaBstWBWBRNnSyU5kQSk6LYdfgBAHuCAiM=
+   eJxjYKAv4GNgaMAnz8PAkMANpAlhMQLmkAMkqG0gDqCMxObHIi8MpbmAWAXKVgdiUTR1slCaE0lMimLX4QcAuu0C+w==
   </data>
  </layer>
  <layer name="fade" width="10" height="14">
@@ -35,13 +35,13 @@
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="144" y="240" width="24" height="60">
+  <object id="1" name="main" type="door" x="144" y="240" width="24" height="60">
    <properties>
     <property name="level" value="greendale-lounge"/>
     <property name="to" value="bathroom"/>
    </properties>
   </object>
-  <object name="rope" type="spawn" x="48" y="264" width="24" height="24">
+  <object id="2" name="rope" type="spawn" x="48" y="264" width="24" height="24">
    <properties>
     <property name="nodeType" value="key"/>
     <property name="sound" value="false"/>
@@ -49,7 +49,7 @@
     <property name="sprite" value="wastebin"/>
    </properties>
   </object>
-  <object type="info" x="168" y="240" width="24" height="24">
+  <object id="3" type="info" x="168" y="240" width="24" height="60">
    <properties>
     <property name="info" value="The lightswitch is broken!  Good thing you have that flashlight!"/>
    </properties>
diff --git a/src/maps/greendale-lounge.tmx b/src/maps/greendale-lounge.tmx
index 3f516613a..f16f926b9 100644
--- a/src/maps/greendale-lounge.tmx
+++ b/src/maps/greendale-lounge.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="24" height="14" tilewidth="24" tileheight="24" nextobjectid="39">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="41">
  <properties>
   <property name="blue" value="92"/>
   <property name="green" value="114"/>
@@ -10,19 +10,19 @@
  <tileset firstgid="1" name="greendale-lounge" tilewidth="24" tileheight="24" tilecount="154">
   <image source="../images/tilesets/greendale-lounge.png" width="264" height="336"/>
  </tileset>
- <layer name="Background" width="24" height="14">
+ <layer name="Background" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJzd1LkOglAQRuEh2CKl2mLtioqiKK64sqioj+Ojc0x8gptLQ/HlzzSnHENEjBLVYIl8Ieb/1q1K/Q666KGPAYZwMcIYE3iK/Slm8DHHAgGWWCHEGhvF/hY77HFAhCNOOOOCK26K/RgJUmS444EncrzwxkehX4etUYMupMlCWmhr5NB1NDerpszf9lMAk/ch2A==
+   eJzV1LkOglAQRuEh2CKl2mLtioqiKK64sqioj+Ojc0x8gZtcCoovf6Y55RgiYpSgBkvkCzH/ty5V7nbQRQ99DDCEixHGmMBT7E4xg485FgiwxAoh1tgodrfYYY8DIhxxwhkXXHFT7MZIkCLDHQ88keOFNz4K3TpsDRr0IE0W0kJbA4eeo6lVdWX8nJ8C32QgZg==
   </data>
  </layer>
- <layer name="Foreground" width="24" height="14">
+ <layer name="Foreground" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJztzssKglAUhWERsgYOtLKJ10BNqxfygiMvOPf98R84EEH0hCBCCz44m31YbEk6fs64jGZ5r0MEou59wIpcccMdBh4z/xKkUAT7bThw4eE52Rc4oUQFXbA/Qow3PvhO9i00ZMhhCfYvpYOJGg1eG/X6CIZ3uFHnP7+lBxEjByM=
+   eJztzrsKg0AQheFF0Fgao5WXWHj3iaJipRF735/8hcUWUVi2EMEDH8zOwGGFuF4esKW3cdZHLhoXL3jw/9w/aGEp9kaI8UYi7QeYGDHhqdhbokKNRtovcNChR6jYu5cVAb6YUWj2pci2OdfsunOcH4R6BrQ=
   </data>
  </layer>
- <layer name="Tile Layer 3" width="24" height="14">
+ <layer name="Tile Layer 3" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AUDHXQSAMzi2lgJi1B6wDYCQCCNwF6
+   eJxjYBgFo2AU0Bs0DrQDBgC00sEOAOYcAQc=
   </data>
  </layer>
  <objectgroup color="#000000" name="floorspace">
@@ -44,12 +44,6 @@
    </properties>
    <ellipse/>
   </object>
-  <object id="4" x="558" y="222">
-   <properties>
-    <property name="primary" value="true"/>
-   </properties>
-   <polygon points="0,0 -54,0 -54,-6 -462,-6 -486,18 -534,18 -558,42 -558,90 18,90 18,18"/>
-  </object>
   <object id="5" x="234" y="283" width="6" height="6">
    <properties>
     <property name="height" value="24"/>
@@ -60,13 +54,13 @@
     <property name="height" value="24"/>
    </properties>
   </object>
-  <object id="7" x="486" y="268">
+  <object id="7" x="438" y="268">
    <properties>
     <property name="height" value="20"/>
    </properties>
    <polygon points="0,0 18,18 54,18 36,0"/>
   </object>
-  <object id="8" x="472" y="263">
+  <object id="8" x="424" y="263">
    <properties>
     <property name="height" value="24"/>
    </properties>
@@ -98,17 +92,17 @@
     <property name="height" value="24"/>
    </properties>
   </object>
-  <object id="14" x="513" y="261" width="14" height="6">
+  <object id="14" x="465" y="261" width="14" height="6">
    <properties>
     <property name="height" value="24"/>
    </properties>
   </object>
-  <object id="15" x="546" y="288" width="18" height="6">
+  <object id="15" x="498" y="288" width="18" height="6">
    <properties>
     <property name="height" value="24"/>
    </properties>
   </object>
-  <object id="16" x="542" y="288" width="4" height="6">
+  <object id="16" x="494" y="288" width="4" height="6">
    <properties>
     <property name="height" value="36"/>
    </properties>
@@ -118,9 +112,15 @@
     <property name="height" value="39"/>
    </properties>
   </object>
+  <object id="4" x="558" y="222">
+   <properties>
+    <property name="primary" value="true"/>
+   </properties>
+   <polygon points="-46,2 -102,2 -102,-6 -462,-6 -486,18 -534,18 -558,42 -558,90 -30,90 -30,18"/>
+  </object>
  </objectgroup>
  <objectgroup name="nodes">
-  <object id="18" type="info" x="126" y="102" width="36" height="24">
+  <object id="18" type="info" x="126" y="102" width="36" height="48">
    <properties>
     <property name="info" value="1609 - The land now known as Greendale is discovered by the Portuguese explorer known as Sir English Memorial while searching for a cure for syphilis."/>
    </properties>
@@ -139,7 +139,7 @@
     <property name="to" value="admin4"/>
    </properties>
   </object>
-  <object id="21" name="vendingmachine" type="door" x="508" y="152" width="44" height="64">
+  <object id="21" name="vendingmachine" type="door" x="460" y="152" width="44" height="64">
    <properties>
     <property name="background" value="true"/>
     <property name="closedinfo" value="You need some rope to get down there."/>
@@ -157,7 +157,7 @@
     <property name="trigger" value="doortriggers.vendingmachinetrigger"/>
    </properties>
   </object>
-  <object id="22" type="hiddendoortrigger" x="480" y="174" width="72" height="24">
+  <object id="22" type="hiddendoortrigger" x="432" y="176" width="72" height="48">
    <properties>
     <property name="height" value="24"/>
     <property name="message" value="Each year in the US, 6 people are crushed to death in vending machine accidents. Are you sure you want to move it?"/>
@@ -184,7 +184,7 @@
     <property name="width" value="32"/>
    </properties>
   </object>
-  <object id="25" type="sprite" x="476" y="247" width="88" height="48">
+  <object id="25" type="sprite" x="428" y="247" width="88" height="48">
    <properties>
     <property name="depth" value="20"/>
     <property name="foreground" value="true"/>
@@ -198,34 +198,34 @@
     <property name="info" value="1979 - The Greendale Air Conditioning Repair School is founded and the prophecy of the truest repair man is foretold by its founder, Steve."/>
    </properties>
   </object>
-  <object id="27" type="info" x="312" y="96" width="48" height="18">
+  <object id="27" type="info" x="312" y="96" width="48" height="40">
    <properties>
     <property name="info" value="2000 - Greendale Community College gets a roof."/>
    </properties>
   </object>
-  <object id="28" type="info" x="156" y="156" width="36" height="30">
+  <object id="28" type="info" x="104" y="156" width="29" height="60">
    <properties>
-    <property name="info" value="1812 - Homesteading begins in the area then known as Verdant Valley. Settlers find that name at odds with the poor soil conditions and perpetual plagues of locusts."/>
+    <property name="info" value="1812 - Homesteading begins in the area then known as Verdant Valley. |Settlers find that name at odds with the poor soil conditions and perpetual plagues of locusts."/>
    </properties>
   </object>
   <object id="29" type="info" x="186" y="96" width="84" height="24">
    <properties>
-    <property name="info" value="1974 - Greendale Community College is founded. It is established after a bet between two senile identical twin industrialists on the site of an abandoned rendering plant."/>
+    <property name="info" value="1974 - Greendale Community College is founded. |It is established after a bet between two senile identical twin industrialists on the site of an abandoned rendering plant."/>
    </properties>
   </object>
-  <object id="30" type="info" x="240" y="150" width="42" height="12">
+  <object id="30" type="info" x="240" y="150" width="42" height="66">
    <properties>
-    <property name="info" value="1983 - Students demonstrate their political activism by occupying the administration office in a 13 day sit-in protesting the school's racially insensitive mascot, Big Chief Drunky.| They succeeded and the school adopts a new mascot, The Sober Casinoman."/>
+    <property name="info" value="1983 - Students demonstrate their political activism by occupying the administration office in a 13 day sit-in| protesting the school's racially insensitive mascot, Big Chief Drunky.| They succeeded and the school adopts a new mascot, The Sober Casinoman."/>
    </properties>
   </object>
-  <object id="31" type="info" x="285" y="150" width="72" height="36">
+  <object id="31" type="info" x="285" y="150" width="72" height="65">
    <properties>
     <property name="info" value="1990 - Manuel Noriega is granted an honorary degree."/>
    </properties>
   </object>
-  <object id="32" type="info" x="210" y="150" width="30" height="30">
+  <object id="32" type="info" x="210" y="150" width="30" height="66">
    <properties>
-    <property name="info" value="1983 - Students demonstrate their political activism by occupying the administration office in a 13 day sit-in protesting the school's racially insensitive mascot, Big Chief Drunky.| They succeeded and the school adopts a new mascot, The Sober Casinoman."/>
+    <property name="info" value="1983 - Students demonstrate their political activism by occupying the administration office in a 13 day sit-in| protesting the school's racially insensitive mascot, Big Chief Drunky.| They succeeded and the school adopts a new mascot, The Sober Casinoman."/>
    </properties>
   </object>
   <object id="33" type="info" x="240" y="246" width="36" height="48">
@@ -278,5 +278,11 @@
     <property name="to" value="admin4"/>
    </properties>
   </object>
+  <object id="40" type="info" x="155" y="155" width="37" height="60">
+   <properties>
+    <property name="info" value="1813 - Settlers consider other names for Verdant Valley.  |These include Scab Canyon, Harmon's heartbreak and Racist Meadows before deciding on the less emotionally charged 'Greendale'."/>
+   </properties>
+  </object>
  </objectgroup>
+ <objectgroup name="Object Layer 3"/>
 </map>
diff --git a/src/maps/greendale-secret-lab.tmx b/src/maps/greendale-secret-lab.tmx
index c0a76ee9e..66f790eec 100644
--- a/src/maps/greendale-secret-lab.tmx
+++ b/src/maps/greendale-secret-lab.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.0" orientation="orthogonal" renderorder="right-down" width="24" height="14" tilewidth="24" tileheight="24">
+<map version="1.0" orientation="orthogonal" renderorder="right-down" width="22" height="14" tilewidth="24" tileheight="24" nextobjectid="9">
  <properties>
   <property name="blue" value="159"/>
   <property name="green" value="123"/>
@@ -7,52 +7,75 @@
   <property name="soundtrack" value="greendale-alt"/>
   <property name="title" value="Borchert Hallway"/>
  </properties>
- <tileset firstgid="1" name="greendale-secret-lab" tilewidth="24" tileheight="24">
+ <tileset firstgid="1" name="greendale-secret-lab" tilewidth="24" tileheight="24" tilecount="150">
   <image source="../images/tilesets/greendale-secret-lab.png" width="240" height="360"/>
  </tileset>
- <tileset firstgid="151" name="collisions" tilewidth="24" tileheight="24">
+ <tileset firstgid="151" name="collisions" tilewidth="24" tileheight="24" tilecount="546">
   <image source="../images/tilesets/collisions.png" width="632" height="512"/>
  </tileset>
- <layer name="background" width="24" height="14">
+ <layer name="background" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYmBgYKIhZqQxZgZiFihNTQw0s4EZgulivjxUXIECMxUH0P2j5uM2nw+I+amM+aDmKwPZICxJZaw8TDAtyzYQBgA7VhU0
+   eJxjYmBgYKIBZqQRZgZiFihNDQw0q4EZgmlqrjxUXIEMsxQHwL2j5jIw8AExP5UwH9RcZSAbhCWphJWHKKZFmQPCAFbrFCQ=
   </data>
  </layer>
- <layer name="wall" width="24" height="14">
+ <layer name="wall" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJxjYBgFo2AU0BLw0cbMBhDNCsQSNDAfaGYD0OwGWpiNbAcNjacLAAD0ygKH
+   eJxjYBgFo2AUYAN81DWrAUSzArEEFc0FmtUANLOBmmYim00DY2kKALZSAoc=
   </data>
  </layer>
- <layer name="foreground" width="24" height="14">
+ <layer name="foreground" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJzt0Lsvg1EAxuFOqMltLCOqLq2ibkVR6lrF4FIGpQxaasCqf7ln+CSGb0Ni+H7Jk5yTnLzDicWiov5/FY454ZQkY6QYZ4JJpoL3GaaDcweddIXsxunmkipXXJNlhlnmyDHPAosssUyCHnrpC+5nnHNBPwPcUeeeB/KssMoaBdbZYJMiWwyHuKHGLYMM8cQzLV7YpsQOu+yxzwGHlDkiHeKRBk1GGA35t5/0yhvvv7z7vQ/af7j/1SfsWRgy
+   eJzt0DdPQlEAhmEmFScTHdERC/aOCtgQbCDoYAEHsQ0WZFBW+eU8wzW5k3FQp/smT84ZTr7hxGJRUf9XhSqnnDHOBCkmmWKameD9HPPBvYde+kJ7cfq5okadaxZYZIllVlglzRrrbJBgIDjPueCSQYa4454HHsmQJccmW2yzwy559kiG3NDglmFGeKXJGy0KFNnngEOOOKZEmRNmQ5545oVRxr7/+h/3zgftX9oL90nnD3a/6gJX5Rdj
   </data>
  </layer>
- <layer name="super foreground" width="24" height="14">
+ <layer name="super foreground" width="22" height="14">
   <properties>
    <property name="foreground" value="true"/>
   </properties>
   <data encoding="base64" compression="zlib">
-   eJztzKcOgDAUQFE8IIEvRbBJ2HvzvVxR2TQIFOlNjngdzzB0Ot3fChAiQowE6cu/vuTMhAVbzAVKVKjRoFXs7NBjwCi5d+DCE/OEGQtWbNgV+w+cuHAjQ654/1UPOxcPug==
+   eJztzzkKgDAQQFF7tVRPauEuuO+75/UXKSxSBBubfHiQIUwghqHT6f4uQIgIMRKkirv+62zCgi3mAiUq1GjQSt7o0GPAKLl34MIT84QZC1Zs2CV7B05cuJEhV/rVtx4JyA+6
   </data>
  </layer>
- <layer name="collision" width="24" height="14" visible="0">
+ <layer name="collision" width="22" height="14">
   <data encoding="base64" compression="zlib">
-   eJybzsDAMJ2GeAMDbcAGNHrU/JFj/jE0TA3zTwHxRiA+SUDfKSQ1MD3o+CQW8wmBU2jmHSegnl7hT8uyYTgAAHouOS4=
+   eJybzsDAMJ0GeAMDdcEGNHrU3KFv7jE0TIm5p4B4IxCfJKDvFJIamB4YPknAvbjMQzbnOJHupRaAmUeLPDwUAQAnmDVw
   </data>
  </layer>
  <objectgroup name="nodes">
-  <object name="main" type="door" x="24" y="197" width="35" height="67">
+  <object id="1" name="main" type="door" x="24" y="197" width="35" height="67">
    <properties>
     <property name="aniframes2" value="1-9,1"/>
-    <property name="anispeed2" value=".35"/>
+    <property name="anispeed2" value=".9"/>
+    <property name="closedinfo" value="The door closed and you're locked in!  Maybe raquel can help..."/>
     <property name="hideable" value="true"/>
+    <property name="info" value="The door closed and you're locked in!  Maybe raquel can help..."/>
     <property name="level" value="greendale-computer-wing-3"/>
-    <property name="movetime" value="2.7"/>
+    <property name="movetime" value="7"/>
     <property name="offset_hidden_x" value="0"/>
     <property name="offset_shown_x" value="-40"/>
     <property name="offset_shown_y" value="40"/>
-    <property name="show_sfx" value="throne_door"/>
+    <property name="show_sfx" value="open_the_door"/>
+    <property name="sound" value="false"/>
+    <property name="sprite" value="jukebox-iso"/>
+    <property name="sprite_height" value="67"/>
+    <property name="sprite_width" value="35"/>
+    <property name="to" value="jukebox"/>
+    <property name="trigger" value="raquel"/>
+   </properties>
+  </object>
+  <object id="2" name="raquel" type="npc" x="372" y="198" width="24" height="67"/>
+  <object id="3" name="borchert" type="npc" x="312" y="216" width="48" height="48"/>
+  <object id="8" name="next" type="door" x="108" y="198" width="35" height="67">
+   <properties>
+    <property name="aniframes2" value="1-9,1"/>
+    <property name="anispeed2" value=".9"/>
+    <property name="closedinfo" value="The door closed and you're locked in!  Maybe raquel can help..."/>
+    <property name="hideable" value="true"/>
+    <property name="info" value="The door closed and you're locked in!  Maybe raquel can help..."/>
+    <property name="level" value="greendale-computer-wing-3"/>
+    <property name="movetime" value="7"/>
+    <property name="offset_hidden_x" value="0"/>
+    <property name="show_sfx" value="open_the_door"/>
     <property name="sound" value="false"/>
     <property name="sprite" value="jukebox-iso"/>
     <property name="sprite_height" value="67"/>
@@ -61,7 +84,5 @@
     <property name="trigger" value="raquel"/>
    </properties>
   </object>
-  <object name="raquel" type="npc" x="372" y="198" width="24" height="67"/>
-  <object name="borchert" type="npc" x="312" y="216" width="48" height="48"/>
  </objectgroup>
 </map>
diff --git a/src/npcs/borchert.lua b/src/npcs/borchert.lua
index c1b539f9c..ca43e3f91 100644
--- a/src/npcs/borchert.lua
+++ b/src/npcs/borchert.lua
@@ -23,19 +23,23 @@ return {
   },
   talk_commands = {
     ['Money?']= function(npc, player)
+    local script = {"I hope you can put that money to good use fixing up Greendale.",
+    				"I'm sure the Bursar knows what to fix up, her office is in the Administration Hallway.",
+    				"Now leave me and Raquel alone!",
+    				}
       if npc.trust < 1 then
         Dialog.new("I have a couple million Gerald Ford dollars in that bag over there. How about you leave me alone and I hereby grant this money to Greendale?", function()
           --taking in the inflation between 1974 and 2014 1 million gerald ford dollars would be worth ~5,044,350.65 USD
-          player.money = player.money + 5044350
+          player.money = player.money + 5044351
           npc.trust = npc.trust + 1
           npc.menu:close(player)
-          Dialog.new("I hope you can put that money to good use fixing up Greendale.  I'm sure the Bursar knows what to fix up, her office is in the Administration Hallway.  Now leave me and Raquel alone!", function()
+          Dialog.new(script, function()
           	npc.menu:close(player)
         	end)
         end)
 
       else
-        Dialog.new("I hope you can put that money to good use fixing up Greendale.  I'm sure the Bursar knows what to fix up, her office is in the Administration Hallway.  Now leave me and Raquel alone!", function()
+        Dialog.new(script, function()
           npc.menu:close(player)
         end)
       end
@@ -45,7 +49,8 @@ return {
   talk_responses = {
     ['Who are you?']={
       "I'm Russell Borchert. I founded Greendale in 1974 with money from the 9-track cassette player I invented.",
-      "I allowed the Dean to seal me and the entire computer lab off from the rest of the campus while I worked on creating a computer that could process human emotion.",
+      "In 1980 I allowed the Dean to seal me and the entire computer lab off from the rest of the campus.",
+      "I wanted to be left alone while I worked on creating a computer that could process human emotion.",
     },
     ['What is that thing?']={
       "This is Raquel. She is the computer I created to respond to emotional stimuli.",
diff --git a/src/npcs/hologram.lua b/src/npcs/hologram.lua
index 5e82fe8a1..a440a1e47 100644
--- a/src/npcs/hologram.lua
+++ b/src/npcs/hologram.lua
@@ -40,7 +40,10 @@ return {
             sound.playSfx("greendale")
           end)
     else
-      Dialog.new("This almost looks like the platform to some kind of hologram...", function()
+    	local script = {"This almost looks like the platform to some kind of hologram...",
+    					"It seems broken though, maybe the bursar knows when it will be fixed."
+    					}
+      Dialog.new(script, function()
           player.freeze = false
           npc.menu:close(player)
         end)
diff --git a/src/npcs/officercackowski.lua b/src/npcs/officercackowski.lua
index 282bd76cc..e5cb4446b 100644
--- a/src/npcs/officercackowski.lua
+++ b/src/npcs/officercackowski.lua
@@ -17,8 +17,8 @@ return {
   greeting = "I'm {{red}}Officer Cackowski{{white}}.  There were reports of a disturbance, something about a bandit, and I'm patrolling the area.",
 
   walking = true,
-  max_walk = 240,
-  min_walk = 240,
+  max_walk = 100,
+  min_walk = 100,
 
   stare = false,