More work on comment user done.