kicks happen too

some more cleanup of param inputs (sorta)