some changes
Additional things I think we should updated are marked in the doc // @sospirited