Fixing Walkthrough video stuff. Cleaning up Merge mess from earlier