Trimming some unnecessary stuff
Fixed maze bug