fixed mistakes, added test for window evaluator