+ fix issues with avatar & name