Fixed bugs.
Commit!