Fix typos.
Fix imports; use local path.
Bundle filelock to simplify installation.