Update notes for submitted changes

* Fix off-by-one error.
Update notes for submitted changes

* Fix NullPointerException.