more tests. more fixes. a nod at resolve.