fixed some messages;