Notes and TODO added.