update map, tweak constants