improved validation rules in presentation and models