Bring up to date with latest spec

[lawrence-forooghian]

A bunch of spec changes and fixes have happened since implementing; compare with the spec versions we based implementation on and address any spec-related TODOs in code.

┆Issue is synchronized with this Jira Task by Unito