allowed for user control of control law, and fixed issue with time of measurement