Renaming

more meaningfull names
Date field

with validation
Quick fix

Quick fix