More style fixes, course fixes, etc etc