few more nits and rebasing