Bringing back to speed.

Some little things that didn't make it in. says I need to commit to
change branches, and these look right.