Fixed bugs, upload working