Level2 changes

About 50 pull requests from Marc. Many are 2119 changes proposed by Mary that Marc agreed with. I've adopted the approach of accepting the ones I don't think are harmful and pushing back on the ones that I think are really bogus and harmful. This also gets most of the AD comments.