fixed wonky selectors and inproper param order