Tons of fixes.....