more tweaks to if's