Small changes to track plots, prep for trajectory debugging