formatting fixes
adding in map rendering, classes, objects.

Trying to avoid hardcoding as much as possible