Mainly adding field-level validation, but some general tidying up too