Lots of minor improvements
Merge branch 'testdeps'