#95: a little cuke work; cleaned up #97 comments