bugfixes and optional settings, pvr finished