Update and Clean up

Note that this filter only applies to velocity and kits

Also, "applys" is misspelled