Whitespace tweaks and minor bug fix. Wrong payloads still run.