Fix and improve eval, other fixes