Updated Solver to include new conditions for displacement and final velocity

For some reason I ignored the use of the actual kinematics for some of the solving functions. Added in kinematic solves for displacement and final velocity.