Closes #1
Fixes bugs in map drawing