complete Evaluation and bugs fixed