fixed error with evaluation, all components working