fixed minimap and other bugs
Merge branch 'master' into miniMap
merged that shit