some variablen fixed
some changes