Commit 78d85b9c84f404025e287449695dc3e26d8c276c

Nikhil Ramakrishnan 2018-06-04T18:42:29

Restore missing comment lines and other minor fixes