Style and logic changes, mainly styling scoring