
        addressed majority of review comments

cc94b6a