SIRange and some small improvements