some changes to shown messages