fixed some message issues