Minor fix: more efficient range subtraction. A TODO re: all in.