[nits] minor tweaks and bug fixes