New demo; repaired failure recovery
Fixed annoying stuff