Bugfixes in comment matching. Added {% comment %}. More tests.