Some quick comments update & bug fix.

There was an issue with the comments not being properly parsed, I think
this fixed it.