Updated a lot to do with map loading and management.