The Exit of Nightmare: Bugfix March 31

Fixed some minor issues