Add speed support, fix particle tracking.