slight refactoring and avatar unset fixes

// FREEBIE