Finish manage departmental roles; bug fixes

3.8