Added some more interpolation methods

Also updated the controller to finish with a perfect end state.