general updates to comments and output