changes from ashaw and mako from a final read

Community Data Science Collective || Want to submit a patch?