More improvements and refactor wizardry.
Working on blog posts. Laptop is DEAD