Mostly category style tweaks.