More config parameters, fixes from first test execution
Fixes from connection testing