Improvements to geometry stuff
More work on editor and associates