Fixes. Last Finishing Updates for Upload.