Minor restucturing of uploader. Remove program reset (should never be used). Fix -p command.