Video load logic fixes and updates #55

Merged
merged 2 commits into from Nov 3, 2011