improved map loading