fix as much as I can

fix as much as I can