better avatar support

still needs improvements