-Added DoorEntity
-More code cleanup
-Fixed a mess I created during code cleanup