fixed a bunch of msg things