2nd copy of master

Various things went wrong with the merging. I fixed them.