Thanks @
Karellen , if there is more interest/issues, I will start a new thread. I had forked this Addon to get my feet wet in Kodi Addon development (and because it was not maintained and needed modifications for Matrix).
Thanks @
Nanomani , I have merged your PR's to the code.