upload, clean fixes