Improve parsing, switch to htmlcleaner vs stupid scanner