Small syntax improvements.
Now actually using the WorldMap class.