some cleanup, add option to print payload