fixed some bugs, UPLOAD COMMIT