I stepped in poo along the way, but I think I solved the two mute problems here with this PR 
I am now awaiting a telling off and/or review from @jb55 and @Daniel D’Aquino. Both gents have quite a few things they are working on. I'll update you as I hear feedback from them.
GitHub
Build software better, together
GitHub is where people build software. More than 150 million people use GitHub to discover, fork, and contribute to over 420 million projects.
