Spec updates for consistency
Merge pull request #123 from mhaskel/spec_updates

Spec updates for consistency