fixed error with evaluation and new now feature for evaliation