fix map drawing; add map movement