master #1 more fixes to test geometry