bugfixes and updates