Really all that needs to be better about it is that it shouldn't automatically lock to tori/uke.
Maybe limit to where it can't look backwards.