updates to IIF to make it... MOSTLY working