last updates

before merging with bryant