some minor changes and bugfixes