Add basic support for embedded attributes.
Fix typo.
Add doc-blocks.