Added terms
Added macro locators
Using proper labels
Changes to edition macro
Changing substitutions on author and author-short macros