finished 137r and add some todos code

as title