Attached is a new patch which implements everything requested.