Minor changes

Manager departs properly, fixed some TODO comments with more accurate
requirements