cmd line flag changes, payload fixes, and output fixes