bugfixes, upgrades