Worked a bit on evaluation and plotting