Fix some bugs.
Add some changes. Never mind.