DO NOT MERGE these review comments. 

Mostly these are just packaged up review comments.
There are also a few direct code changes you might want.
Delete this notest branch when done.