improve messages to user
improve messages to user