drop more options, fix payload, fix puppet