more additions-changes for superuser etc