First working map!

Fixed map to properly calculate bounds and markers.
Fixed bounds of test data.