#235 messages to user and fixes