Fixed some more commenting