Largish commit after a bit of a hiatus.
Minor fixes.
Update