thank you for the feedback, a new patch is attached. let me know if i
missed anything.

- zach