remove syntactic ambiguity
do a better job with figuring out the current room