Minor change: changed some messages and added a new one