Updated to latest version of click library, and fixed relocatability issues.
Switch to better video data storage and conflict resolution.