many formatting changes, some more cases filled