fixed bugs.
Add sth.