added some stuffs
fixed bug