more formatting changes. issues remain.