mostly formatting changes etc