some fixups...

...to get tests running. these are mostly quick and dirty fixes and just for discussion.