Tons of fixes!