Final changes from advisor, and small formatting changes