Minor fixes

Fixed formatting, added comments, added MainTest & Manager