Parts 1 - 5

Final cosmetic changes.