first iteration of fixes