Fixed the merge of all three JS bits

lots of love

Matt, Charlie, and Vince

p.s..