small changes to comments, messages