minor map and movement improvements