Fix bugs.
Improve design.