Map fixes

fixed the map loading. Added in a state class enum