addressed more validator issues