Improved validation and displays of Church