significant math changes + other stuff

-Alter how trajectories calculated
-alter how multpl eplots are built