Office

various clean-up and streamlining changes.