config changes, bugfix