ISF : small corrections and tests
small changes in rfr