user messages support added;
some fixes;