Some work on comment editing