changed superuser & cleaned up