tweaks and renaming