Custom Voice Buttons, Some minor error fixes.