+ fix some bugs.

Signed-off-by: Euhow <euhowzy@gmail.com>