start debugging & some bug fix.