Fixed a few bugs. First, entries will no longer be skipped.

Switched parsing to use something closer to a real parser, instead of line by line regex processing.

Fixed a bug where a scaling value could be skipped as a result of a double line set of extra data.