buoy stuff
extend map by yellow
buoy-stuff
fix buoy-writeout
Fixed a few compiler issues