More appropriate copyright
Custom validation and other cleanup