add stop kinematic plots + clean up