More Merge Changes
- Various small tweaks that I meant to make while merging.