some more finme tuning