Infra for progress report + some small formatting fixes