Several r-oxygen formatting changes