fix mistakses
fix mistakes and add more debug info
fix