Tiny additions, renaming and tweaks