Improve map and player positioning