Updated Eve, fixed some scalability issues