changes and bugfixes