Interface simplfied by removing the -upload option.
Pre-release test version.
This version includes updated error messages.