Final changes to comments