add TODO list and some minor cleanup.