Notes and TODO updated.