Various tweaks, refactorings and fixes.
Version bump