fix bugs.
Uncomment