inproved ui (fixed concurency issues)
fixed some trigo, but it still don't work