Tweaks to validation
tidying up as much as possible
More tyding