fixed a few messages a bugs