Fixed some more comments