Fixing all problems

NOW everyting is Ok! I do it with a lot of Knoledge