Changes and bugfixes