Data upload to server
Fix bugs