Version bump.
Refactor files.
More tweaks to improve insertion timing.