Back out maze and bug fix