remove fuzziness, improve proximity error messages
add links field
rebuild