Lots of changes

My first pull was from the wrong pull of terr1.  This incorporates all those changes.