some formatting and formulation fixes