updated eval and some other stuff