touchups to adminControl and cattag manager