Improve logging
Move payload assignment to before payload ref. :-|
Change /flat suffix to -flat