some more finessing