various bug fix in uploading and editting