Update and fix everything