update TODO some, some needs to merge to DESIGN