Added in new options and demos.