Video support plus some cleanup tweaks.