add a 64-bit range check
add more tests
refactoring add new match fields