Changes some messages to make more sense