KAZOO-213: comments, tweaks, and other stuff from karl