lots more changes - revert to using installed curl