Fixes introduction feature timing and memory leak.

Additionally introduces on/off switch for this feature.

Fixes #4