lots of fixes and default avatar