more cosmetic changes
last of the major cosmetic changes