many small formatting fixes