added more testing. fixed bugs in eval strategy