new map... and some minor fixes
Merge branch 'master' of https://github.com/otruffer/Ape_On_Tape