first round of fixes