fixed maze, testall
Merge branch 'john'