ref: 78d85b9c84f404025e287449695dc3e26d8c276c
parent: cc6267722451af26c8f7d318429af6f6d6b6efef
author: Nikhil Ramakrishnan <ramakrishnan.nikhil@gmail.com>
date: Mon Jun 4 14:42:29 EDT 2018
Restore missing comment lines and other minor fixes