start of eval+small changes