Various improvements + completion of empirical tuning for all relevant samplers