Update for Eval.py
Parser patch

Fixes some bugs