Fixes for recursive explosions
Bay12 Mapping Derps.
Merge branch 'master' of https://github.com/Kiithnaras/Mariner24