Checkin of Jack's buffer mods.

Not really checked, but didn't fail any tests either...