Fixed a timing bug in Manager and added comments