fixing forum for Officers again
cleaning up some code and adding inline documentation in places