more tweaks for #97 based off additional fine grained testing