Refactor all.
Fix bugs.