Minor bugfixes.
Major improvement in the parsing engine. Should greatly reduce the time
needed to run the script.