half maxrecords on small map;

map waypoint assignment fix
Merge branch 'new-map' into next