minor changes and bugfixes
rename