first set of fixes after the review