Formatting changes, fixes