Improved eval.py (and adjusted parser.py