fixed map recenter, needs refactoring