map fixes and login fixes