Fixed message system
More messages fixes