messages module was added; some fixes;