fix bug and add some parse