More work on editing/commenting