code improvements, configuration files samples