varibales name change and some more little issues