Validation fixes

Chages based on suggestions from w3.com