round one of fixes