fixed the comments and messages