Added a few templates, and fixed a bug with recognizing successive comments.