Unit testing finished. Refactoring. Bug fixes.