More choco improvements