added movement and check for keeping player on map only