Tightened up some of the source added/modified earlier where the go compiler was not availble.