Updated popFormValues / disabled demo stuff