small changes and sample connection settings