isel.py: changes in formatting. substitutor.py: improved matching