Overhauled both parsers, changing error reporting system