Minor updates
Added group validators; other improvements