[fix] some fix, maybe unstable, see log for full detail (demerde toi)