Area map drawing fixes, some other map-related work