Finishes Avatar functionality. Fixes Heroku server bugs