fix bugs, change doc..