Made a ton of fixes.