couple of quick fixes
work!
woking on helper toggle