udpates and corrections to adapter (making Main use AdapterClient)