Tweaked comment related stuff