Corrected old to-do's.
Added placeholder for future stuff.