consistency

mainly testing.  starting proposal for long list of changes