Numerous changes before final commit to master. Very-minor tweaks left.