some help clean up, but equations are still broken