Minor formatting changes and question fixes