Add debug output
Add self-validator to ease testing
More consistent debug output
More inline with `*Output` type name