Macro entity generator in progress
Fixed some formatting issues
Removed macrogenerator (fails to compile); it is still present in macro_generator branch