Continued to integrate Jsoup.
Much more cleanup.