* map [+harbour2] some minor fixes