Improve Map
Various Improvements