That sounds right to me.

But what happens if you combine improved critical and a keen weapon?