context tweaks and some mild naming changes