[US20] Add some comments to the code and some todos regarding strange behaviors