some more fixes and changes after talk with client