Minor changes and TODO update.