bugfixes and user config changes