fix bugs with comments part 2