Fixed minor changes, tested on Littman's hallway