added comments handling