insert forgotten TODO's in the last commit