some map fixes
Fixes #37