comments overhaul