minor tweaks after first full test pass.