minor fix
Comment plugin; improvements & minor fixes