Fixes of update key and fixes to create nice demo
fix