Changes

The only reason I'm not fixing any of this is because it will likely be reverted by others. I'm waiting for your say on this.