Recfactoring and IE Fixes