sample delivery rework and some debug in varieties