Fixed some small challenges. Hopefully the new map API is correct.
Merge branch 'master' of github.com:Kyrremann/TagStory