updates for bugfixes