Major improvements to map rendering.

Atlas isn't being used at all for now.