some small bugs is added.