Bug fixes
Infrastructure / reorganization for "operator" mode.