minor inlining
prettyfying but need to retest this
going back to non tabbed heredoc
new files and tweaks to output