Fixed some comment issues