Fixed problems with tangential kinematics and added constrain maxima feature