Refactoring. Fixes. Improvements.