Cleaned up comments and added additional todos.