bug fixes and refactoring
Merge branch 'master' of github.com:jgdevelopment/HauntedMansion