more message changes in Control.cpp