Fix All of Stefan's Mess Ups