multiple fixes and ajustement awale and core