Two RangeSelector changes/fixes (pull request 160)