Haven't hit it with the really nasty target, but the general behavior seems better