Improves and fixes demo example