add supermanager and some fixes