More tweaks from my read-through