put some TODOs and clean up minor things for the recursion patch
10 files changed