Various Map fixes as well as new settings