improved map and controlls