rc: vbv fix for scene changes

Also, some spacing nits