addressed validator issues