Added a macro and fixed some typos