Misc changes, mostly for display and fixing the map