Additions / fixes to produce payloads

Pull request as discussed in issue #32