many changes… basic form and plot on calculator page now