Adding comments, upd. evaluation