done some todos