Made some stupid mistakes in the struct macros.
Also I tweaked a few examples so they would run