Add eval and CSV input; tweak keep and bucket.