small tweaks, improvements, renaming