Make comments editable

Single squashed commit, replaces the edit-comments branch merge request.