Minor fixes
Method comments