s01-us02: fixed some bugs