Sorry about formatting of previous patches, here they are attached.

-Ben