More tweaks for comments due indent issues