Trying to use stricter parsers.
Added some stats.