fixes for the pvr section + some improvements

see commit details