added --debug option, removed janky  options everywhere