Fix brackets and such, localise PVR in settings, remove unused VARs