This is a new improved set of patches based on the comments that I received in response to the previous set. I believe I addressed all the concerns raised but I'm sure there will be new ones.