+ some evaluation corrections