Map fixes
String name fix
Merge pull request #169 from freekzy/dev

Map fixes #170