Cleaned up commented-out code.  Revised to-do list.