various cleanups
ignore kinematics sometimes
merge