remove koush's superuser for now, some othe small changes.