Hi @jungle,
I have addressed all your points in this patch.
Thanks