Minor additions, formatting changes