bufixes, formatting changes.