One million improvements
Fix the stuff that broke during the one million improvements