Some more refactoring, cleaning.
New tagged build.