Various bugfixes
Merge branch 'develop' of https://github.com/PistachoSoft/PistachoTV-2.0 into develop