fixed messages... I think