noun message fixed, other improvements