Formatting changes, a few fixes attempted

Chrome appears to be broken