Joe changes

All of my -04 changes as one big patch.