Reconciled Differences

Merged a few changes between our files.