Fixes, cleanups and improvements to pantheraUpload