Fix bags and add more comments
Fix bags and add more comments