Merge pull request #499 from Markolie/master

Slime runtime error fixes, minor map fixes
Merge pull request #2 from ZomgPonies/master

Merge pull request #499 from Markolie/master