Combine editorial and minor changes into a single merge for 4.2

[ssteinbuss]

The following PR are approved and can be merged:

• #216
• #217
• #237
• #239

The issues listed below are addressed and can be closed:

• #215
• #225
• #238