updating changes, mostly to validation