Maze feedback m2

Only the last commit in this branch belongs to this pull request. Waiting for the other commits in the previous pull request to be merged first.