Hai, these here patches are what I've got based on Boqun's review.The plan is to stuff in them in locking/urgent somewhere tomorrow.Please holler if you see anything that ought to make me reconsider this :-)