Fix some messages and comments