A few improvements to parts that don't read well
A few improvements to parts that don't read well


Former-commit-id: 3b6f45406b8298c795a4dd5296cd75de1664ef74
brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg,brandur/sorg