initial upload + previous error fixes