small changes, add TODO notes.