bugfix for too many upload retires + added comments