Fix some bugs
Test out some nice macros in the example