added extra calls to retrieve connectstring used
    reengineered connect somewhat to make retries etc explicit