Fix bugs.
Next step: wrap up.