A few tweaks per chads note.