New fresh version

Fixet many things