minor changes
minor changes and bugfixes