finish change check assess and fix some bugs