Fixing issue with new options; Updating demo with new features;