Several new macros. Package has options.