Tweaks to message system, removing bugs