merge last week team changes

these changes include : 
1. Bug fixes for API
2. changes to the upload.