Fix bugs, re upload