numerous small formatting changes