Improved evaluation figures and other minor fixes