gradually adding testdata... and some fine-tuning