More style and infrastructure tweaks.