Made some more additions to the patch.