update to account for package change on set utils.  add annotations for
restricted package access (feh).  Add Geometry routines in prep for
refactoring.