Added glitch-resistance, fine-tuning