reoxygen and fix bugs