More string swapping and cleaning up main().
More string switching.
Starting to remove some macros.