few fix + clean + tests