Update and fix all the things