Refactor.
Add :data fields.
Make use of @link/@linkplain more consistent