Lots of formatting changes, adjusted some fields a bit