Comments addressed

Closes #1.