Fixed some commenting issues in the figures