Update to disallow connecting DATA to Conjunction
Bug fixes, and output refactoring