lots of formatting changes
formatting fixes and enhancements