Fixed bugs with the comments