More evaluation tests, fixed bugs discovered through testing.