General Changes

We've made a few general changes.