renaming and small tweaks