updated lots of stuff

inbetween file name is now hallway
updated vhat to use location enum