More fixes to bring into line with google style guide and redo of geometry to bring into line with coffeegl