fix derps and update toolchain