fixes by comments for PR