others changes + few tests