fixed some details on private variables
added somet things
merged