Some small updates to comments and messages