Player Role Fixes

Updated how player roles are defined to better find the correct role.