more work on making the -i option work everywhere