added comments parsing