Update messages

Done cleaning them up now