another portion of fixes and amendments