fixed even MORE map bugs