More work on the spec.
Fix styles.