spelling, macro tweaks, and new problems

Found a few spelling mistakes.
Moved all bootstrapping macros into datagen
Finished 3-3 question 2