fixes and renaming