many changes to upload functions, transferred repo