Update and fix stuff