Add some debugging options, commented