Small touchups
Rework first part of 11.1