solves commment update problem on 2.11

other minor cosmetic fixes