Several fixes and changes according to customer requests