Maze builder and small bugfix...