Fix managers, re-add deleted code; fix git-inserted text