Choco3: More updates for Choco3 newer version (almost all are now fixed)