A few fixes, work on avatar handler