Terminator and Starwars filler added.  
CK_DemoLoop now correct.
Merge origin/master