Parse and evaluate variables

More fixes and tests for general evaluator