Form Validation, small improvements