fix quoted comments & unify comment module selector