added rest of evaluation. for now.
cleaned the content