some fixes and changes after talk with client zarubi