Fix broken command line @properties; Add PVR support