Changes by Friedger

Merging into main for now. A few of the updates need revising.