Playback Lock, 16:9, and some cleanup