bugfixes and renaming