fix schema
change and restrict expiry date and info
fix check