Added more payloads, minor changes to output formatting