added surf-testing, refactored binscontour and buoycontour slightly