Misc work on geometry systems