progress fixing comments bug