Most errors ironed out, in the actual parsing of files now