updated message
some fixes