Bug fixes, refactoring.