improvements to nonconservative discretization