Added complete support for separate avatar images and names. still wip