Modulo gadget refactor
fixes
gnao