ahh thats the reason my things where jumping around when playing with the comments, I did fix it almost the same way as you did. well then again I kind of had 1 to many in the code.

1 thing to note, the possibility to control if you want to have comments on or off in the settings for this theme, as long with some other settings as well like the default theme has.