more work on map loader