Yet more changes to comments