added optimality
made some equation display style
some cleanup
more cleanup
removed old file