avatar fixes, closes #23