Comments issues fixed