Assorted

Cosmetics, bug fixes, cukes, and specs.