Interface/output tweaks
Restored bulk of previous content, ready for other samplers