1. performance fix
2. supervisor bug fix