restructure player messages so they don't get swallowed anymore