many changes Oct. 21. A few more to come.
two additional minor changes. Done now for a bit.
Merge remote-tracking branch 'ae/master' into ae
Merge branch 'ae' into cf