WIP; hand merge changes on master since branching

- still in testing