changed nubmer defaults, moved options to the top in the demo