address Manish's comments -- some doc changes and toolz usage