minor changes and bugfixes