minor cleanups; working interface with yorbit