Additions and Adjustments

Fixing a few of my previous changes