More re-writing; Macros for declaring figs, locs