More validator additions/improvements