Analyzer and retriever, significant updates.
Made nokogiri test pass