next portion of fixes