final fixes on changes requested by client