link's fix
misspell
rework name resolving
add tests