Fix up some stuff for gcc and play with chrono
Speed things up a tad with smaller neighbourhood

Rework the map test stuff too.