Updated comments and messages