fixed up controller and model for messages