Update v2.4 Beta

Stability fixes
recovery code working