fixed comments and messages