adding avatar_uploader and some other niceties
some more cleanup