Improved alaysis heuristics, and beginning to match to database.