More style tweaks and changes