Adds macros. Adds all Anders suggestions. Adds new citations