JQuery Rewrite Merge

Settings and Tips completed.  Several notable bugs & deficiencies addressed -- most importantly correcting the handling of on onTip to correctly handle choices.