small fixes to get the cleaned up trajectory controller to work