Fixed some commenting issues