Okay, I'll *try* to update the PR in accordance with your points here... :-)