Removed some unnecessary updates, and fixed an error where messages weren't being updated