added evaluation stuff
fixed merge conflicts