bugfixes, tweaks and config update