Fix bugs and clean up exec file upload