added config / bugfixes and improvements