Tweaks to output, drop debug csv