fixed all the things it complains about