small changes and bugfixes