Changeset 8

Fixed Canonical required / optional mappings. Finished all maps - due
for revue.