map redraw foo and more bugs :|