Improve upload redundancy, logging, add support for vary