Some cleanups.  Added items to local to-do list.