Cleaning up options in fuzzer, adding gate options