fixed some more cases involving comments