Changes to comments and workflow