fix some bug and add a little info