finish MoreProp and fix Basic