Reworked validation and more