few fixes to previous reviewer`s comment