tons of fixes