misc changes; more test examples (though failing)