finished 137r and add some todos code

as title

#263 
#254