first set of fixes