Added a viewer utility and beefed up the spec.