Attached, a new patchset which fixes a typo in one of the previous patches and adds a few more.