more fixes, mostly due to changed map api.