merged in nathan's change with player, fixed some styles