Comments tweak