avatar working (somehow)
fixed avatar env variables
fixed merge conflicts