misc fixes to rml traj gen, not yet working