Modified dependecies a little
Fix a map loading bug