Added a toggle for mutated mode (fixes #21)
Minor code fixes