Lots of validation improvements/fixes