finalize improvements to local resolving