mainly tab formatting changes. Also some rearrangements