Dungeon 2 fix ups.
Finished merge with Brian's code.
Merge branch 'master' of https://github.com/majora2007/CerebralAcademy