another portion of fixes