Merge pull request #499 from Markolie/master

Slime runtime error fixes, minor map fixes