Match the spec properly

Fixes #1 and #2.
ahhhh that makes sense. Thanks for clarifying.