Revisions 10.23

Almost everything from Matthias's on-paper comments
Needs work.