More Bow improvements