clients now auto configuring + various refactoring