messages & minor fixes