All but one validation errors fixed.