FYI

Just FYI, these are the remaining tweaks I applied before merging.