Cuddled else
Expand output syntax. Sanitize rows and candidates
Output all data not a test row) and removed cruft