Updated somethings. thnx to Hughes77 :)