work on image uploads
some cleanup