Updates, eval fixing