tweaks and fixes, upload working