Trying to fix some focus problems.
Focus issues seem to be stablizing.