large number of fixes