Map changes, bug fixes
Merge branch 'master' of https://github.com/Markolie/Paradise