Some changes + eval.c added