Several fixes and improvements to an evaluation module