Configuration tweak and fixes
Client refactor