fix errors & stuff