Rename some variables and add TODO's.