Reworked Player/Avatar relation. Also fixed some client-client discrepancies.