branchmerged 2, tooltips and some website edits
coded the ending choice links